Fix building with --disable-modules --with-included-loaders, create an

Mon Dec 22 01:35:36 2003  Matthias Clasen  <maclas@gmx.de>

	* Makefile.am (gdk-pixbuf.loaders): Fix building with
	--disable-modules --with-included-loaders, create an
	empty gdk-pixbuf.loaders file.  (#124496, Arno Charlet, fix
	proposed by Owen Taylor)

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index f9ff08314ea1499fefe5f86fbd26986d1d60c38a..b24edaabe006c3c5b96d0fda42549aefc4b0619a 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,8 +1,15 @@
+Mon Dec 22 01:35:36 2003  Matthias Clasen  <maclas@gmx.de>
+
+       * Makefile.am (gdk-pixbuf.loaders): Fix building with
+       --disable-modules --with-included-loaders, create an 
+       empty gdk-pixbuf.loaders file.  (#124496, Arno Charlet, fix 
+       proposed by Owen Taylor)
+
 Thu Dec 11 01:57:05 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init): Move
        the documentation for signals inline, to get proper parameter
-       documentation.  (#128977)
+       documentation.  (#128977)       
 
 Sat Nov 15 00:26:19 2003  Matthias Clasen  <maclas@gmx.de>
 

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 1666a261026749a368a0008c3f008878ee72caba..9b1d5b512f814b45d4a611da2bdb754e46da8d3a 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -451,6 +451,7 @@ else
 all-local: gdk-pixbuf.loaders
 endif
 
+if BUILD_DYNAMIC_MODULES
 gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders
        LOADERS=`echo libpixbufloader-*.la` ; \
        if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
@@ -460,4 +461,8 @@ gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders
           echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
          touch gdk-pixbuf.loaders; \
        fi
-
+else
+gdk-pixbuf.loaders: 
+       echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
+       touch gdk-pixbuf.loaders;
+endif